Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 13 Jul 2011 22:06:30 +0000 (15:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 13 Jul 2011 22:06:30 +0000 (15:06 -0700)
commitcc0bb7b1c6e1688ba9f89e7fd70660864ae6f4dd
tree84d3d16556ba55f948d27fd537cdbc0237145ad6
parent96abb6357119a5bb1216ea9542b799b681cf704b
parentc855e6fdf6b544da843e5b1fd31cccd4042fe15a
Merge from trunk.